Fixing some bullocks and stuff.