a few fixes and method overloads