various bug fixes and interface conformity