Fixes

Add comments