NEW STUFFS AND BUG FIXES.

I already know I can merge, but I like that you see the changes before doing so.