Fixed all the found issues