macros and commands polished and added