Minor changes, mainly in toString methods