style changes, js bug fixes, basic outline for multiple match