working through bugs and display issues