resolved repo mix-up and cleaned things up a bit