Add more towers, minor improvements