tweaks and fixed links