Some work on text edits and a small comment fix for uploadlayers