One severe bug and many other minor changes