Fixed lots of small things, train is about to pull in!