MAJOR BUG FIXES