some fixes and testing
todo updated