coments, performance improvements