Minor code improvements
Switched to tank dev branch
Remove test code
Fixed incorrect image