Fixed some things (WIP)