more fixes to Jessica bug...clean up and refactor some methods, etc...