some fixes, added set-functions