Editing students works
merge fixes