format updates, minor data type optimizations