More formatting shenanigans, updates