changes from last week

I forgot to commit before i left :-\