many changes, bug fixes, UI swaps