Fixed service access
Typo (of -> or)
Done several small changes