Finetuned to return expected types and limits.

initial commit