options form working + few changes