Fianlized editing, lots of improvements