Further fix the sit command

Some little bugs, and also meta