fixed everything
yay!
checkpoint
fixed minor issues