Small bug fixes and clean up
Can round 17 and 23