More structual stuff fixed

Wooo stuff be cool