Add consnructor and fixed some notes