Fixed verious errors still a good bit to go.