Minor Bug Fixes & General Style Clean