Feature Updates

Just some minor changes