fixed all the broken parts.