craft fixes + cleanup