Made use of the new commands BI made available as well as improved some code in places.
Merge pull request #688 from CorruptedHeart/newCommands

Made use of the new commands BI made available as well as improved some ...