small changes
fully functional version except import/export
merge in commits from Master branch