Fixed a bunch of stuff
Take skip was wrong way around