Bump 0.15, some improvements