fix title, bug fixes