various random fixes + will add more documentation ltr