Moved around and updated some stuff