Fixing stuff, adding code for display