bug fixes from localizing stack,...