revise context for bash and some macros