Finished tomahawks and cleaned up some warnings