Fix bugs and improvemnts Props: @mandava