touchups

will work on twitter integration next week