General bug fixes

See ToDo and Update Log for more information