some other tweaks from eprj and aremcee(CM)