Syntax corrections

Some minor syntax corrections plus preparations for edit_page