Cleaned up Addressing Modes More