Fixes and interface design