add modules from connect branch, plus twitter block