Some minor bug fixes but the serpent is still pretty messed up