Update previous merged pulls

[Xsintashi]

github fucked branches and actually previous merges added nothing lol. This pull adds missing features