several fixes for easier use