working on last form. minor bug fixes and tweaks