fixing bugs, tweaking display