Bug Fixes + added quotes