Added shortcuts, UI wrappers, and fixed syntax.