Compile errors squashed
cleaned out unused code; renamed classes and members; build fixed