small changes, hopefully the last