Use ag; some minor updates