fixes to resource editing
merges in changes from master