And more stuff
Merged changes