Bug Fixes and Doc updates

Added expanded formatting features and fixed bugs.