#22

Fixing some details