Updates, improvements, cleanup

Hi David!

this pull request contains changes by others and myself. Please review and tell me what you think!

Cheers,
Jan