some minor changes and link to wiki