Update a few things
Move some more things