minor updates, some cleaning