Final Fixes and comments