changed a buncha things, sorry for the horrible commit message, I've been listening to Styx - Come Sail away on repeat for like 2 hours