Added a max amount of ships, and a todo improvement