Bug Fixing + Integration