Got ship node deletion working
Minor change to makefile, code cleanup
Code cleanup
Done besides code cleanup