small changes
more small changes...