add command shortcuts, fix packages in prototype