various bug fixes...context related