Numerous Improvements