char:random: Some tweaks from around github