moar fixes
bootstrap
no comments
clean up commit