Refining forms, fixing variable errors