bug fixes and general updates... pushing live