Fixes and comments