some changes, mostly in GUI (most likely not working yet)