do some minor changes
working ...