new methods, small fixes