Bug Fix update for v1.0.2

- Various Bug Fixes