Some Jello and a Hard Place: L2 - Final(?) Update Before 18

Fixed some small things, hoping that this doesnt require any new updates.