add extras and clean up bootstrap stuff