some errors fixed, basicaly calls to constructors