Minor changes and final touches