Various updates and feature adds