Lots of bug fixes and issue cleanup!