Major Bug fix/Balancing.