cli build and some point improvements.