Fix #29 + various other small round bugs