Small enhancements,  also some name changing in #11