all the above implemented fixed in #1368