trolley with initial bug fixes