added custom variables
fix link references