Add __str__(), manual testing, minor fixes