More bugs

by Daniel Cole