Update to latest commit of changes & bugs fixes