Using now set() if possible, various small fixes/optimizations