Misc fixes
Misc fixes / usability / flexibility