Fixes, sort of works now....