Fix tabs, comment patch