Increase version, fix small bugs