more datatype changes. should be clean everywhere now.