Lots of small bug fixes, updates