Changes everywhere

too many changes