Various fixes + Twitter link