Bug Fixes

  1. Fixed loading macros
  2. Fixed macro translations