Cleaned things up a bit, added details.