Changed title, minor fixes