Added display features, fixed bugs

Almost ready to actually test some features! :) Goodnight!