Updated a few things. Check the commit changelog for more info