ui tweaks, more advanced options, minor bugfixes