Moved stuff and fixes.