fixes to make avalon more responsive