Fixes

Fix Typos made by earlier commits, add missing variables .... Fix Build