Merging latests updates + fixes