Updated bootstrapper

Should hopefully be less errorprone now.