a couple bugs fixed... ... a couple.