Fixed link generation again, added more argument parsing