Added more bugs

All the bugs I could find.