Fix A LOT of bugs