updated names and formatting, and merged changes