fixes and improves