Fixes and impr