Updates & Improvements

Improvements and updates to features