Fixing some stuff and testing some stuff.