added request debug and cleaned up validation