Fixes and improves