fixed some class splitting problems, changed some interface text