Thx Amon and crew, some nice additions :)