Thursday's improvements. Many problems fixed