Some final feature adds