Fixed comments, updated positions