now everything that worked in 0.2 seems to work again, and should actually be better. plus, merging differences is done properly and thus should be way more reliable