fixes, improves