misc modificiations