[Woutercx] Changes: suggestions of dalexsoto incorporated