added morphing and made highliting look even nicer. added Javadoc, manually merged from matthias miller and the masterblaster