Minor bugs fixed, changes to display added