added ship and other changes

Signed-off-by: Robbie Bise <ittociwam@hotmail.com>