Bugfix, Refactoring & Inline-Doku