some fixes and introduction