Updated commands and fixed various bugs