updated formatting, includes website now