code cleanup + new Bundle options