updated method signitures
too many bugfixes