added label tags and tweaked copy
rewrote some parts