Updates, fixes, improves