few interface improvements