more bug fixes; fix non-appearing comments