cleaned up input forms
hodgepodge update