Added title and fixed stuffs