Version change and small fixes