- fixed messaging for js and nonjs
- fixing alerts
- refactoring
- small fix