Constructor fix and comments