removed confusing constant prefixes, fixed uninitialized memory bug