tank movement is buggy
cleaned up logging
merge conflicts
merge conflicts