fix speed issues and add random wander