(fixed more bad bugs)