changed a few paths and fixed the multiple instantiations