add "all" to driver and do some general cleanup