bootstrap and other changes, not usable yet