#30 small fixes