fine tuning
rebuild
added links