various bug fixed for display and controller issues