some minor fixes + remove Sailor.java