Death to desk
fix link
tweaks
fix previous fix
merge from master