More improvements and reference to the wiki