updating cardmaker, more fixes