better toString() and some renaming