Merge pull request #41 from aringlis/master

More cleanup of AWARE code plus a few bug fixes