Some minor tweaks to remidners