Some tinkering
some fixes