Performance Improvements; Minor changes to start.xml