Renaming things and fixing an exit bug