fixed elliotts bugs