Fixes major & minor annoyances.