Fixes and tweaks to commands and stuff