more changes which didnt get caught the first time (dont ask me why)