Major Updates and Cleanup