fixed few errors but still not done