Right on all accounts

[@Eklispe] I'll sort it now/tomorrow