some effect data added.
More minor clean up.