lot of fixes and addons