mix of new features (dont even know what and merge I think .)
I'm not confident of this commit to be honest, but those were staged
changes I may as well commit