Added bootstrap files + small fixes