Fixed more bugs caused by compara refactor, and tidied up some whitespace