fixed stuff, more debugging