few fixes... need to deal w/ hacking sys.path in tests... ;(