did some minor  fixes for ! checking