Collected suggestions from testing_v0.2