Moved to bootstrap

A handful of small changes ;)