removed last few Bugs out of Exc. 2 b) :octocat:

Happy Testing