David Furlong
fix bugs