Initial kit and some other changes