Tweakes and changes