more changes

maybe we should branch stuff