Updates

@ekfriis, please check that nothing is hosed. We had some problem in merging