some displays bugs corrected