Fixed bundle class.
Tidied frameworks.