* wip: added some badges * - some final touches * small fix * - corrected wrong error message * fixes after code review