updating formats and various cleanups