text updated, code cleaned up a little more