fixed struct issues, calc kinda working'