changed to factors, combined y and x's
added fit