varesh commit after bootstrap and fixes