More stuff!
Made some minor changes
Merge test