polished some stuff