Fixed small bugs to get gui up and running