AG|ST: design tweaks from bruno