completed initial bootstrapping fixing a few issues