Fixed a few bugs ...
...
fail