updated python files to accomodate bootstrap code
merging