minor changes, belongs to last commit