Ooops, fixed a catastrophic failure. also general cleaning upping