Many corrections after feedback and further testing
Many corrections after feedback and further testing

thijskh/OpenConext-engineblock,thijskh/OpenConext-engineblock,thijskh/OpenConext-engineblock,thijskh/OpenConext-engineblock