Testing for bugs and trying to fix GUI