Changed char. name, various nips & tucks