Display added
Tests and corrections