Update formatting and stuff for ms