added yos, improved bootstrap