Fixed code issues and added plugin changes.