Fixed many errors. A few steps from completing to min specs