Final Commit - bug fixes, optimization, secrets

bug fixes, optimization, secret ending added