further adjustments, making public interface more sensible