fixed a few things, which showed that everything else is broken! :-(