Edit stuff here and there
Merged changes