Fixes and Comments