Fix some bugs, take a stab at the sliding bug