Major Updates & Bug Fixes