General cleanup and ReadMe update.