Fixed some stuff

Diff from today