feature complete...now for some bugs