fixing stuff for correct form
added limit control