Fixes, refactoring and improvements

Check the request and update gem, please