fix some scope issues & removes + adds neccesary characters