final commit 3

fixed constants. had a lot of str.