small change and comments, removed code I commented out.