Small Updates/Fixes

@Strongbird: Please do try to avoid damaging the actual code in your typo/blank hunt