Moved things, fixed #5