fixed two horrible little bugs in cpp Tested everything on crystal.
fixed two horrible little bugs in cpp
Tested everything on crystal.

jeffschulte/protein,jeffschulte/protein,jeffschulte/protein,droundy/protein,droundy/protein,droundy/protein,jeffschulte/protein,droundy/protein,droundy/protein,jeffschulte/protein