Fixes and some features added