issue #6 : we keep fleet until they're returned at home

also splitting code and redoing the auto construct method