Updated stuff, and moved some things around