various fixes, added todo