Update sources
Fix comments