Fixes Typo and changes position of observers