Fixes / improvements