Many small fixes:) wat dingetjes aangepast qua benaming.