Info added. Small cleanups.