Go Home!

Also fixed a minor bug