various changes for debug