fixed some display & timer issues