Removed old observer; we don't need it any more.
Started fixing getters/setters; 2 regressions.