small fixes, methods renamed