Added new function, fixed macros and adjusted keys