FIXED some minor mistakes