added new data; cleaned alot up;