simplified interface
minor fixes