Fixed most if not all getters and setters. Cleaned up Ant and fixed some of the randomness