started adding typesystem changes
fixed some java errors
fixed wrong equality test in shipbuilder