Cleaned up code and fixed a few bugs relating to forms