added bubble charts, more clean-up