Closures, improves, fixes, updates