bigass form halfway done, some fixes and new additions