added basic CLI Functionen - Fixed bugs
Added basic CLI functions and fixed bugs