comments added and some changes...