Added more cross links and little improvements