got bootstrapper working, cleaned up some stuff