Corrections

Still WIP
Corrections