Added CLI help support and also some assert statements