Updated old forms, removed some stuff, added new