added more use cases, small fixes