added in meminfo support
fixed merge conflicts