final corrections

object orientation issues, correcting bugs from refactoring, commenting
view conditional compilation