work on debugging stutter behavior, mostly debugging and cleanup