more content...a little cleanup, more to come