UI bug fixes and refactoring. Some Javadocing (because that is totally a word). Improper static method calling fixes.