A few more items. Bug Fixes... etc.