updated some stuff
merge
updated to have many many many changes
merge