#19 Some small adjustments