fixed many errors should be good