Cleaned up bundle list. Added FSwitch mappings.