Bug Fixes & Command Changes