CLI: Using indexes in every function
CLI: Fixed bugs