Bug fixes. Display now works better