#28 changes/fixes :strawberry:

:melon: