1.5.15

Mostly bug fixes