Fixed almost all todos