Small update v2

more small updates