Reverted sigslot changes and finshed fixing other errors

Decided not to use boost::signals2 as it was a lot of work for no real benefit.