warning fixed; comments added