🤞

Minor Improvements and Bug Fixes