Added post editing, some minor changes also