Fixed unsave ant warnings and cleaned up a few things