Changes amounting for a future update

too many changes to write...