Next - City Jump bugs

Addresses concerns raised in #216