Minor Bugifxes and Improvements