correcting things due to comments