bootstrap cleanup in progress
bootstrap touchups