bug corrections and GUI improvments