add fixes and add fixed sizes