Fix bugs + small changes