bug fixes, overhauls