I fixed some of the issues