Renamed some stuff, fixed a bug.