Modifications by Colok

@colok do you have anything to add, or can I close this?