Fixed a butt-load of known problems