added some new stuff
started adding tags support