Hotfix/about imrpovements