Bug fixes for observables, still some issues but got a 10/10 on grading