More fine tuning
New links!