Officials support added. Some project cleanup.
To previous commit.