* fixes and interface improvements