Various Improvements

Parent Project broken now?