spritesmith + some fixes