Cleaned up, added maintainer.