Updated display, added inc, dec, some finetuning