fix i<->sh, fix styles