Fixed all mistakes