Minor reorg and additional commands