added/removed some more things