Activating fixes

Fixed the tool and macros not always loading.
Fix #127