more small fixes trying to get it working