Small format changes and fix's