integrated venus and saturn illustrations, misc bug fixes and refactoring