Moving alerts to logs and implementing movement fixes
updated again