Fixing bugs and eq/gt/lt commands work