phpdoc cleanup and some spacing. Also sample Observers updated.