Remove unused thing and update PART 1/?
Add error for wrong commands
Edit the message when error
Remove unused thing and update PART 2/2 + Some pimp changes