Updating after completing some demos and before next major revision
Adding editing and related changes