Small API changes and comments
(#467)