Some comments added and path fixing