Added default constructor, fixed errors