Minor fixes
makes the thing work