Changed title and fixed bug