resolve first batch of bugs in ex19