Small comments/logic changes