twitter & small fixes
merge