lots of minor tweaks to update everything and fix any little mistakes