double check for referenced word values, fix some formatting