Fixes and better Struggle.