- better right click menu
- better checking logic