various minor changes due to comments and upped to new fw version