some updates and CLI added. fixed syntax problems