cleanup and added objects for Z&B Unit Rules #25