Cleaned up, added feature list