Kind of fixed some things
Merged