Minor changes, added constructors to all classes