added labels, fixes, etc :)