updates in progress

Opened new temp branch to solve some issues in develop first...
some additional minor changes