moving around a few more things (as they were not wired up right anyway)