added feature to take first line as header + shortcuts + various fixes