Feature/apply scruitinizer patches

Patches and some documentation