Fixed bug causing IllegalStateException on registering an observer, because it wasn't previously removed. Also the observer wasn't registered on first load. Included files this time