tags input and minor changes