Minor Bug Fixes & Teaching Single Improvements