Various Command Fixes / Cleanups + Clear Potion Effects command.