[TASK] Fix todos in commands - Closes #49