General Fixes

TODO: Fix Join and other commands.