fixed some methods/constructors