lab6 - error correction (still full with errors)

used "code injection" from lab6 solution files, which solved most
problems (at least the red lines), but ended up causing millions of LNK
errors ....