Added citadel, fixed shop and tweaked collisions with cruisers