fix bugs; remove unused stuff from interface