omg more formatting updates