commting bug fixes