1.5.10

Lots of bug fixes