Begining of keywords doc + some fix