Fixed all errrors