fixed a few snafus, resynced repo