Added save shortcut and changed code-builder return name.