Fixed some stuff
Minor fixes
merge
Refactored checkouts finally working