Finalization

A few files have been updated to support the latest features, and more
planed features have been listed.