Fixes things and makes more better.