fixed the borked solution/csproj files, added the last commits from main repo by hand

Signed-off-by: Algorithman <algorithman.chris@googlemail.com>