fixed include paths and added missing constructors