final fixes for 1st production run
moved
now working on v2