Some Catcoin changes, nothing usable yet