a few updates and merges with rod persky's commits