added more gui stuff and overall bug fixes