* Minor Fixes in new Format