minor cleanup and link fixing