Added standard excel format and other minor improvements