added more info and added some links and images
fixed conflics