set safe to true at driver level
minor cleanup
0.2.4