FIX: improved toString() and formating