more documentation and cleanup
implementing basic tags