minor struct changes..