Fixed some silliness and added some more error checking.
Some work done on facade.