added links, Bug Fixes