Updated

a whole lot of new tests and features