cleaned up, organized, moved vocab composition stuff to the end