more comments and added more wiping where needed