finalised the multiple masters support
fixed some nasty little bugs too
10 files changed