Fixes to format bugs and change of version