lots of changes to the bugs system