some fixes
more verbose names