fixing a few horked details