more editing, commenting