Update gem file and some minor change