Some changes to gi's user interface