Improvements

Please review and merge/rebase.

Thanks!
Jan