minor improvements
build + suggestions