final bug fixes and attempt at form merge