Minor changes, add get_title()