Moved some things, made minor changes