Some comments added, lil fixes also