A bunch of fixes related to the tank and same other small changes, also first jenkins build