Minor revisions, added final and protected

For #39