Lots of interface changes

no javadoc just set, soz