lots of errors cleaned up. Mostly just need operators errors