Buttons'n bears update

It has been a while since my last update. And I haven't done a lot at all. The threads are getting more and more messy. So I did some tidy-up work.