Fixed some bugs (too long ships+clean up)