Part of fixes and small update