bug fixing?

some bugs fixed, other bugs notedly not fixed