long day of 23 updates and bootstrap integration