little things
Merge done