Moved things around
Small fixes