Bootstorm Improvements