Bug fixes, last checkin was pretty terrible