keep track of current word and minor restructure