changed stuff from yesterday
Fixed merge conflicts.