More uncrafting and some minor reformatting.