Various bug fixes

Tweaks to jail functionality - begun adding property upgrade
functionality.