Fixes

PHPDoc fixes andsome bug fixes
small addition
Merge remote-tracking branch 'origin/Development'