removed some debugginess