Added statl page links, some minor bug fixes