more bug fixeroos