major updates

updated main, added match