Post edit additions and fixes