Cleaned up a little bit, and fixed proper bootstrapping