Cleaning up and fixing a few thingsb 

- Should fix /d
- /notice will now work

======
Just test before you merge, so I don't mess up the server. But 99% sure that there are no errors.