polishing some stuff