minor edits, to help it to compile