Added argument shortcut and fixed some issues