update with cscope and other minor fixes