Fix some stuff and move other things around