Optimizations, cleanings, fixes...