Fixed link error and small fixes