Added weapon shop, general cleanup