Unstable

Time to synchronise with unstable. Lot's of fixes and new functionality.