various changes
cleaning some stuff