Add constructor and fixed some notes