More stuff ad changes

Now I feel like I may start to spam too... I blame scala!