minor changes to checking some requirements