Fixed bugs -it is done, I believe