Improve error reporting a bit

and add some FIXME/TODO comments here and there