Better improvements but still need to fix re lists
Fixes the rest of it