refactored stuff and updated gems