Bugfixes + QualityCheck + function 16