Added more version information, cleaned things up.