Various little changes
Merged