Improvements

image (27).png

Bug fixes: