Fixes and add comments