dynamic bootstrap + minor changes