some fixes
kind-of working