minore changes and update to bundle