A ton of changes and updates :)