Misc updates
Misc improvements