All bugs removed...almost