remove unused methods
use intptr_t for switching on pointers
add a missing field initializer
just in case maybe?