design checker and minor changes