Add jade mode, other minor changes.