simmer down now
fix some issues with strucs