Proper title and more tweaks