made Settings and Account forms work, other corrections and improvements