Fixes, added modifiers