Bump up version and some fixes