Comments improved and doxygen