updates to formatting, test STD inclusion