Stable version, fix little bugs