title and some fixes