Mates: Cleanded up and bugfixes