tiny fixes, still doesnt work however