Fixes, lots of debugging today, lots of fixes