Fixing some stuff and some other stuff.