functions: last touches (issue #4)