new Fixes

please merge this request in 2nd order, to fix #333 and other minor fixes