Made lots of changes to forms, fixed almost everything in 1.7.