Display problem fixed, clean up still needed