Cleaned up some forms and fixed #47 and #49
Fix #61