adding constructor
fixing references
incrementing version