cont. 23 updates and bootstrap