Minor updates

Some bugfixes
Code improvements
Code layout improvements
Changed some dutch words into english