Made pointer casts even more lax. Renamed some cells.