LOTS of changes

kinda wrapped it up. but there might be some changes.