toString added, minor fixes