working on various minor stuff, including bugs.