Some refactoring done, also editted ships' images