Some comments
bunch of fixes