#14 few fixes