Fixed all the problems ALL