Feature/fixsize

This reverts back to a few commits before the last one and adds a patch