made some changes to stuff
merge fix