Fixed Add This and some other small things