Moved stuff and added some logging for debug